Layout changed
Some small optimizations