Form style, and markup changes
Fixing double scroll bars
fixing merge conflicts