layout improvements
bug fixes