UI fixes complited almost.