Improved the look a little