Some styles, refactors and button classes added