WORKING ON THE NEW LAYOUT .......