Tests for routes
UI fixes
Fixed indexing issue