Updated history and layout