UHM-958 - Layout changes