Change layout
Remove unuse code