Main screen crash fix and consistency.