Small optimizations and replace table widget with table view (MVC)