Added packaging element and JSTL dependency
Cleaned up contexts and indentation
Some minor quality fix.