Minor layou adjustmenets