Massive UI improvements #1
Massive UI improvements #2