Xorg help after NVIDIA

[veganbikepunk]

So after I turned on the nvidia proprietary drivers (not immediately after but a while after) I rebooted and it couldn't find my driver, so I reinstalled it, but it only gave me a terrible screen resolution (640x480 i think). So I posted about it on here and they talked me through changing my xorg.conf file.

So now I'm in a better shape, 1024x768 works, but it's still pretty big for my taste. And the login screen still shows up as 640x480. On my Sys>Pref>Screen Resolution page it offers 1040x768, but when I select that it's huge, somewhere closer to 640x480.

My xorg file is as follows:
# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by failsafeDexconf, using
# values from the debconf database and some overrides to use vesa mode.
#
# You should use dexconf or another such tool for creating a "real" xorg.conf
# For example:
# sudo dpkg-reconfigure -phigh xserver-xorg
Section "InputDevice"
Identifier "Generic Keyboard"
Driver "kbd"
Option "XkbRules" "xorg"
Option "XkbModel" "pc105"
Option "XkbLayout" "us"
EndSection

Section "InputDevice"
Identifier "Configured Mouse"
Driver "mouse"
EndSection

Section "Device"
Identifier "Configured Video Device"
Boardname "vesa"
Busid "PCI:1:0:0"
Driver "nvidia"
Screen 0
Option "NoLogo" "True"
EndSection

Section "Monitor"
Identifier "Configured Monitor"
Vendorname "Plug 'n' Play"
Modelname "Plug 'n' Play"
modeline "640x480@60" 25.2 640 656 752 800 480 490 492 525 -vsync -hsync
Gamma 1.0
EndSection

Section "Screen"
Identifier "Default Screen"
Device "Configured Video Device"
Monitor "Configured Monitor"
Defaultdepth 24
SubSection "Display"
Depth 24
Virtual 1040 768
Modes "640x480@60" "800x600@70" "800x600@75" "1024x768@70" "1024x768@75"
EndSubSection
Option "AddARGBGLXVisuals" "True"
EndSection

Section "ServerLayout"
Identifier "Default Layout"
screen 0 "Default Screen" 0 0
EndSection
Section "Module"
Load "glx"
Load "v4l"
EndSection
Section "ServerFlags"
EndSection