merged
fixed nav positioning
merged master