updated layout and paths
merged and geo locate works