Fixed up and added more Views