Added MenuScreen and its items
fixed merging