Commit 60

Various updates. Continuing GUI overhaul.