Fixes for index and style