Mockups and styles
Begin cleanup of penitent view. Several bug fixes