Bootstrap added and fixes done for QA