Reformatted and Design fix