Issue #11: Adding right panel and clean some code