cleaned up buttons