added all necessary buttons, now just need to fix the layout