fixed cogs styling
snapshot
fixed conflict