#83 Simplify links
#83 Button refactorings