Working on the UI

A bunch o changes.