html stuff
fixed shadow and border radius
green button
fixed merge conflicts