Refactored JSPs to use JSTL