trimmed down ui
fixed a bunch of ui bugs