changed layout and added a few buttons