major usability changes
fixed merge conflicts