Add Sign in form and rearrange inc stuff.