Fixed visual issues and some performance fixes
Same