Width fixes

Got it to fill up the screen - width isn't just static any more