create view controller update and added more assets
fixed merge conflicts i think?