Moved welcome and farewell back to main