Updated to flat UI

Currently has dropdown bug