more crazy styling
fixed merge conflicts