General cleanup. Including avatar on sidebar.