Cleaning and fixing debug views