Fixed anything that may have broken with last commit, added some UI functionality