Minor updates and another layout