Moved html to jsp for remaining views