Quite a few styling changes to work with new layout.