combined buttons into one file
started layout refactor