[#40] refactored index view