Fixing some visuals and changes