Removed unused code
Changed border width yet again

xD