adding better dynamic start page handling