More view tidying - And removed tabs - again