Better time period selection panel

Change-Id: Id715384ceb399d81c55b364358b559c262b72b48