Finishing cleaning up js and one page appification