Improved UI

Improved UI, note backend functionality not yet added