Latest version

Some redesigns made