added 2 step location view and styling