clean up html
finish sign in and out
fix merge issues