Layout improvements

Layout and Look&Feel improvements