Improved  layout and appearance