fixes and layout mods