bug fixes, css for welcome page and refactor bugs