Fix splash layouts, other ui fixes