Some ui fixes to fit mobile as well