Cleenup and layout changes