Moved and renamed HTML layout