Fixed up User Experience a little

Nicer design, fixed some usability issues.