More updates to layout and remove delete functionality