Made many visual updates. Added modal support.