Fix some UI issue

Add class name and container using bootstrap