Registration and views fix