Layout and CS fixes