Refining of registration checks + pretty buttons