Some fixes + started contacts page