Refactored the look and feel quite a bit