Done filtering options in shop

Filtering options in shop is working ++ minor edits here and there