so many changes i dont name commits
fixed for merge
more screens