Made buttons much more modular