WIP
Still need to work out the bugs when using a navbar