Unfinished - Continued updates to MainFrame