We would recommend the stay at Marwan's place! All important sights were within walking distance. We had a great time in Geneva.