even more layout adjustments