Change layout and use text lists instead