UI Changes implemented + null handling implemented.