removed unused helpers
improved buttons and button
added scaffolding