Correct stuff, links etc..., add logout feature