More updates to layout and forms