diff --git a/icons/cpanel.png b/icons/cpanel.png
index fab6461..8ba12f1 100644
Binary files a/icons/cpanel.png and b/icons/cpanel.png differ
diff --git a/src/main.cpp b/src/main.cpp
index fe94878..af21a43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -233,7 +233,7 @@ void L3D::MainLoop(void) {
   station->SetPosition(vector3d(0,0,0));
   Space::AddBody(station);
 
-  SpaceStation* station2 = new SpaceStation(SpaceStation::GROUND_FLAVOURED);;
+  SpaceStation* station2 = new SpaceStation(SpaceStation::GROUND_FLAVOURED);
   station2->SetLabel("Dfighter's point");
   station2->SetFrame(*pframe->m_children.begin()); /* Rotating frame of planet. */
   station2->OrientOnSurface(EARTH_RADIUS, M_PI/4, M_PI/4);
@@ -245,7 +245,7 @@ void L3D::MainLoop(void) {
   //player->SetPosition(vector3d(0,0,2000));
   //player->SetFrame(pframe);
 
-  Gui::Init(scrWidth, scrHeight, 640, 480);
+  Gui::Init(scrWidth, scrHeight, 800, 600);
 
   cpan = new ShipCpanel();
   cpan->ShowAll();
diff --git a/src/sbre/brender.cpp b/src/sbre/brender.cpp
index e54f0ef..f4148d5 100644
--- a/src/sbre/brender.cpp
+++ b/src/sbre/brender.cpp
@@ -256,9 +256,7 @@ void sbreGenCollMesh(CollMesh* pCMesh, int model, ObjParams* pParam, float s) {
 void GenCollMeshInternal(Vector* pPos, Matrix* pOrient, int model, ObjParams* pParam,
                           float s, CollMesh* pCMesh) {
   Model* pModel = ppModel[model];
-
   Vector* pVtx = (Vector*)alloca(sizeof(Vector)*(pModel->cvStart+pModel->numCVtx));
-  
   ResolveVertices(pModel, pVtx, pParam);
 #if 0
   for(int i = 6; i < pModel->cvStart+pModel->numCVtx; i++) {
diff --git a/src/space_station.cpp b/src/space_station.cpp
index 6cbdb45..acbbc6d 100644
--- a/src/space_station.cpp
+++ b/src/space_station.cpp
@@ -111,7 +111,7 @@ void SpaceStation::OrientLaunchingShip(Ship* ship) const {
   const int dockMethod = stationTypes[m_type].dockMethod;
   if(dockMethod == SpaceStationType::ORBITAL) {
     /*
-     * Position ship in middle of docking bat, pointing out of it.
+     * Position ship in middle of docking bay, pointing out of it.
      * TODO: Need to do forced thrusting thing.
      * TODO: ang vel not zeroed for some reason..
      */
diff --git a/src/view.h b/src/view.h
index 3f743a2..896bb63 100644
--- a/src/view.h
+++ b/src/view.h
@@ -11,16 +11,16 @@
  */
  class View : public Gui::Fixed {
  public:
-  View(void) : Gui::Fixed(640, 416) {
+  View(void) : Gui::Fixed(Gui::Screen::GetWidth(), Gui::Screen::GetHeight()-64) {
     Gui::Screen::AddBaseWidget(this, 0, 64);
 
     m_rightButtonBar = new Gui::Fixed(128, 26);
     m_rightButtonBar->SetBgColor(.65, .65, .65);
-    Gui::Screen::AddBaseWidget(m_rightButtonBar, 512, 0);
+    Gui::Screen::AddBaseWidget(m_rightButtonBar, Gui::Screen::GetWidth()-128, 0);
 
     m_rightRegion2 = new Gui::Fixed(122, 17);
     m_rightRegion2->SetTransparency(true);
-    Gui::Screen::AddBaseWidget(m_rightRegion2, 517, 26);
+    Gui::Screen::AddBaseWidget(m_rightRegion2, Gui::Screen::GetWidth()-123, 26);
   }
   virtual ~View(void) { delete m_rightButtonBar; delete m_rightRegion2; }
   virtual void ShowAll(void) {