Arthuryan/remove pup windows

@LeoCavaille 
For review purposes only. Not to be merged yet. 
will fix indentation, I spent a bit of time on trying to use a CSS file but wasn't able to