Simplify form styling

and make the crop button align more nicely.