Improved the look and feel