Updated to have the content area be scrollable