Add layout
Fix Index view: return class instead of instance