Minor revisions on GUI