Doing some bug fixes that makes the views being loaded