#26 Removed deadlinks from UI