Removed polymer elements, reworked some angular stuffs