UI Change / Empty list fixes