Fixed: links as buttons
Fixes and refactoring.