Logo and layout Issues #7/#34