Added Bootstrap, separated Machine list