fixed menu labels and arrangements
merged conflicts in GSN
Added new shop icon