Handle rotation, added list row layout + Cleanup.