fixing layout, logout in settings