more cleanup and unifying layouts