Layout fixes and added reload at data changes.