Minor style and layout fixes
Resolving conflict
Layout and style improvements