Some more layout fixed and enhanced interface