Added diagonal layout option