Refactor from flat UI to bootstrap again