Fixed layout again
Merge with master