Widget 2 now working better, viewport still needs improving