Layout improvements

Added some more layout