Second draft of entry layout