UI changes + sidebar menu highlighting