Creation fixed, join likely functional but need to add buttons