media queries, and current indicator on nav
merged in master