Fixed square layout.
Changed some theme colors