Fixes widget CSS and cleans up code
Code cleanup