Small fixes: button replaced with links, colored span replaced with border, etc.