Switched to standard layout