IMG-663 Layout changes