Merge branch 'ux-layout-improvements' of https://github.com/advanced-computing/giggling-wombat into ux-layout-improvements

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: indrasuhyar