Updated styles and added more debugging