Typos fixed
Design changes