Fixed register page and few design shits