Clean up registration

We should add something more to clean up visuals