Added features to GUI and moved it around