Updated the styles and markup a bit for cleaner more understandable view