Added Switch between Interface screens
Merge Commit - conflicts solved