Minor Layout modifications