Fix issues in bootstrap top