Some updates on layout