Bootstrap added + some changes