Cleaning up code, adding rotate button