Bootstrap / some styling / UI improvements