major refactor

added buttons
started adding final icons