preference buttons laid out properly
layout cleaned up
Merge remote-tracking branch 'origin/master'