Added extras and fixed styles