Fixed the layout in data, dataadd and goaldetails.