Refactored Classes. Added Location page