Prettify layout, add search capability