Improved the look a bit