added model improvements and ui is almost ready