Refactors for better widget button placement
Adds better mobile widget use