Refactored core html including styles fixing -20px bug