Fix toolbar on small screen sizes and redesign toolbar for