Some changes in paint component and navigation flow.