fixed some view shit, in progress adding some other shit