fix side menu & code refactor