small view fixes, farm page layout, ack I shouldn't have been on master branch