Allignment and design related fixes on Form