add pretty button
Merge branch 'new_master' into camera