Merge "Fix contents overlap to top bar"