Adding more content for the welcome class.
Fixed small issues