Add data to the views and fix worker