Overlapping toolbar partially solved