Bugs solved, simplified and legacy css/js