UI changes and bugs fixed

In "stay connected" and "office location" screen