Intial screen
Remove redunant code
Working commit