added tabs and did some Ui improvements.