Some UI improvements after bootstrap landed