Minor bug fix, TODO: Fix expanded nav view