Updated layout file (better form)
Fixed layout for top-bar padding