More UI changes

No major changes, just current ui as of 8/29