updates to layout and backend