Welcome page prototype 1 + small fixes