Prevent from trying to render without data + Some layout fixes