fixing and merging welcome page layout and stuff to master