Fixed Minor Layout Issues