Some improvement on layouts