ui implementation, bug fixes, few model changes