Cleaned up the layout for the store index