Fixed #372 - navbar flash on initial load