Added some todo's and redirect logic to the button.