Improvements in Current layout