layout improvements
improvements