Added screen option. Fixing some bugs in initial size