Layout & index & packages updates