Redo Layout, Make it behave like a library should.