Working topbar
Category title, not quite right but servicable
Popup an order alert
resolve merge conflict