Icons added, bugs with routing fixed