several updates on funcionality and css