Merged dashboard into welcome