Move back tor status to left side menu

Also some cleanup