removed ':' and fix navbar