Other few changes in layout