adjust styles, merge into 1 custom css