Contact us + some fixes