Fixed bogging down bug. Views are not recreated