mostly fixes and layout improvements