Improved several views