Some css changes and added edit comments (must be reviewed)