fixed visual issues, still not correct I guessé