Improve & finalize AMS presentation