Minor ui and style changes