Last review and css fix