Overhaul, testing new layout