buttons added, backend still messy