Cleaning up some code and layout changes.