updated layout, organized code, for theme.jsp