Lots of ui changes, listview still hasn't been changes (tomorrow?)