Better handling for start page