adding reworked js and controllers
fixing conflict