adding toolbar with layout fix