fixed broken layout
Merged