moved around gui and fixed stuff