Fixes #68.
Removed old debug
Avoid duplicate layouts. Code clean ups.