Merge and edit
Add hide btns, add styles