Removed logout & solved edit page bug