Done tweaking the layout and associated xml files.