Some more interface layout changes