Fixed borked Buttons

Don't know why they lost their way. Also replaced hard coded strings in
xml