Restructred code to call draw screens OUTSIDE of constructor
Demo ready