Fixing the buttons and some links