finish login
merge
add header and subscriptions