Added Bootstrap and some minor changes