Changed Layout
More layout and a start of destroy