minor changes before adam remerge
alls well that ends well except for the blue line
styled action button
merged with peter
Merge pull request #20 from yenbryan/peterdev

peter merge