Made separate mag layout and updated search