Layout and Cache Fix