Added style, fixed stuff