Just some change to make base view better.