Revamp Layout and design