Margins different in one-column and 2 column template 2010 Weaver

Hello,
I am customizing the 2010 Weaver theme and have run into a little problem with the left margin as I choose a page with the “one-column, no sidebar” template vs a 2 column template. My left margin in in about 50px while my 2 column has about 20px. How can I change the “one-column, no sidebar” to 20px?
ps- I took away the padding from the wrapper. My layout code looks like this:

/*
LAYOUT: Two columns
DESCRIPTION: Two-column fixed layout with one sidebar right of content
*/

#container {
    float: left;
    margin: 0 -240px 0 0;
    width: 100%;
}
#content {
    margin: 0 280px 0 50px;
}
#primary,
#secondary {
    float: right;
    overflow: hidden;
    width: 220px;
}
#secondary {
    clear: right;
}
#footer {
    clear: both;
    width: 100%;
}

/*
LAYOUT: One column, no sidebar
DESCRIPTION: One centered column with no sidebar
*/

.one-column #content {
    width: 100%;
    margin: 0 20px 0 20px;
}