Fixed and cleaned up buttons