Fixed #18: Cannot rename links
Improved button layout