Get rid of short tags and clean up js a bit