Welcome Page & Layout Design changes #147