Show schema and improve layout