Layout and css updated