improve and fix layouts