A few graphics and layout fixes