toolbar container and mobile fixes