Some major changes

Functionality and UX changed.