updates to layout and fixes for operations