Fixeing bugs, layout changes