added welcome page + small cleaning up