Layout and assets fixes