Updated: Tightened up all the UI to make things smaller and tighter.