Refactored button system
Re-styled done buttons