Fix small bugs, add Category and Style to index