Several fixes, added logo and icon