added more, removed bootstrap