FG tests for screen model
Some tests
Finally adding some style
More clean up