Added dimens and buttons.
Button code refactor.
UI changes.