Add bootstrap and touch up UI