Fix the views loading order