Changed basic layout