Refactor/navbar and selected lifter style