[NOJIRA] Move additional stuff to skins and clean up the JSPs.