Reworked the whole look and feel