Make design changes, perfect comment sumbitting, fix spacing issues