Modified display format again
More UI updates