Layout and Style fix