Final layout and some icons added