merge
fix positioning hack
fix more positioning stuffs