Fixing layout overlap
Updating button text
Closes #1
Closes #2