Further tweaked buttons so they are more modular