Updated view and did a lil refact