bugfix: little layout enhancements
bugfix: little layout enhancements