Welcome page fixes