Cleaned up layout and fixed exclude filter.