Fixed issue: Clean up layouts a bit