Fix bugs and improve WM visuals