Finished work on core GUI features