Bug fixed
Layout changed