Refactored buttons to not be final