Layout modified + Some little features