Commit 4: GUI changes and house keeping