unified style and non-js resizing

conflict resolution