Cleaned up imports, renamed buttons to have explanatory names, added functionality.