Add description and improvments in layout