fix position of expand
fix cancel import
Merge branch 'master' of https://github.com/puffball/freebeer