Some sizing and layout changes