Updated layouts to add links and clean up forms