removed toolbar and reposition topbar logic [MJ-919]