Store related changes minor UI fixes