Added @waiting style and tweaked settings