Added listener to bottom buttons
Change structure, added and drawables etc..
merge with UI update