Cluster layout improvement; mostly adding @Override tags.