Bootstrap revamp - first commit