Reworked hide navbar/toolbar logic