Cleanup indention and add panel filtering