Updated visual layout