Cleanup Code and fix positioning.