Clearing up code, refactor, renaming buttons