much cleanup and small css updates