Added basic GUI, other minor mods