shortened partial
moved nesting to one partial
Fixed nesting into one partial with buttons