More updates on layouts and README