l
Substantial UI changes, fixed bug on exit