Added in Location and an interesting if condition for view home page