Cleanup of Base using partials
Misc formatting for header/buttons