Merge init screen to dev