Updated to update layout and reflect theme changes.