Some aesthetic updates