Updated some of the core files and started adding view skeleton