refactored more, cleaned up code, redesigned the index page lists layout