Improve detail view and launch screen and prepare for later changes