Added normalize and changed layout