Added some code for registration and updated design