UI improvements, mainly around theme