updaing layout and includes