Ui cleanup. More mobile friendly. Dirty Update