fixed some stuff and updeated views