Make some fixes to coffee cup zIndex