Various updates to layout and functionality.