update welcome ui and cleanup