Some ui related changes