Few interface tweaks