Added star features and better layering