changed default buttons to primary. Fields alignment etc. More
beautification.