Adding sign out button, fix load order issue