Simplify some code
Allow to lock and unlock views to rearrange them or not