Button classes redone

Moving towards a reusable button