Fix some navigation cosmetics and improve and tested form retrieveng data