Updates to newer UI with navbar