Updated views + graphic assets