Completely new style, and made some minor design changes