Refactoring buttons
Adding the loader, cleaning up some misc styles